Commands.java Consistency Cleanup.