Make more use of DefineConsoleMethod

Resubmission of #887 with some fixes.
Yeah, I realise I did this wrong.