Refactored argument resolving out of the ControllerResolver