Some controller-related cleanups.