Fixed a bug in the method names hack, and converted a few more commands
to use the method name hack.