Cleaned up delegating and aliasing