Split and cleanup application_controler#resolve.
Remove misleading comment in application_controler#resolve.