Fix for STAR9000621456 and some insn pattern cleanup for EM