Instruction selector refactoring