There are a number of classes that are coupled to the public api syntax. These should be decoupled in order to allow easier api refactoring and perhaps other drivers built upon the core.