DDF-374: Cleaning up commands by reducing duplicate LOC.