Using a custom namespace support class to allow for delegation.

Backort of #645.