Converted several more commands to new format.