Oh, dear: update specs, bump Rails version, do some cleanup and make specs pass again.