Some much-needed cleanup of ViewController.mm.