Make more use of DefineConsoleMethod

Resubmission of #887 with some fixes.
more evil TABs