WIP: Simplify with resolve.