Fix dtypes, units -> dtype, unit

We had been using deprecated plural versions of keywords.  No longer!