Small style tweak to commands.
Update more function signatures to transitional syntax.