>Also for consistency replace all other instances of TARGET_IPHONE_SIMULATOR with CMD_COMMANDO_ENABLED

Actually this got lost on the merge hehe.