Some more engine reference refactoring before beginning the clients vector changes.