#129 Clean up / simplify some of the overly complex naming in the control merge logic; try adding a test to confirm that control merging does not modify the underlying class definitions, for cases where multiple different VCs extend the same parent class.