Minor refinements: special case some operations for efficiency (reindex)
and a little more checking for input errors.
Authored by: dwarren 2018-02-02
Parent: [r9215]
Child: [r9217]
