Make "controller nl:0" work again, by fixing a layering violation.