Ahh you didn't mention custom mappings before. Yeh you'll have to do it the way you said above. FWIW the sequential way works out somewhat lighter on codesize and instructions... It's a tradeoff, features vs size/speed, which is pretty typical. I'd stick with they way you've got it so you can include custom mappings.