Get to the bottom of this
Remove autoload nannying
Reduce duplication of buffer initialization

Closes #311.