Rework thumb instructions