`..` -> `...` and fixed deprecation warnings

My editor also automatically stripped out a few trailing spaces in the files that were edited.