RFE #2484693 and peephole improvements