DAGCombiner: Unify rotate matching for extended and unextended amounts.

No functionality change, lots of indentation changes.