New resolver code cleanups