Version 1.1.  Various Swift-ifications suggested by Nick Lockwood.