Use mapping functions.  New code for eliminating NOPs.