Move lazy into core
Fix typo that would cause lazy instances to never initialize