Spec cleanup

See commits.