Consolidate CPSR variables