more ARM instruction encoding cleanup