Manifest/template logic cleanup.
Commit initial spec cleanup (WIP).