Make top-level control paths more explicit.