Hi jgart,

I have pushed your patches to master after improving the indentation,
synopsis and description, and removing a few unnecessary parts from the
check phases.

Cheers! :-)
Arun