Cleaned up the spec even more.