move docblock parsing to Controller::expand()