Further tidying of debug in controller, #123.