Do some spec cleanup.