Spec fix and cleanup

[cantino]

Nice meeting you today!

I don't want to fork this to the company organization, so here are the code changes: https://gist.github.com/cantino/17cf8b7345c244b28d6b

[bgreg]

Thanks!