I also think that multiplication and division by 1 should be pared down (if not eliminated). In general, it'd be nice to favor larger numbers instead of using 1/2/3 so much.