Offer option to remove console handler; fix variable shadow bug.

The rest of the integration tests will need updates due to the fix of
the variable shadow bug.