PHASE 6: Use extra rtx_def subclasses