ControllerHandler: More readability improvements.