PUBDEV-2: Cosmetics.
PUBDEV-2: Fix bug introduced in 2ca0222.  Broke SparseTest, but gradle test didn't show that (yet).