More spec additions, and some minor clean-up.