Push phase 2 of the controls rewrite.