Removed lazy resolution as it only really provides benefits in more edge cases than the common case