Split resolve and resolve!
Remove block given to context#resolve