core: Move header-calls to the controller. Minor cleanups.