Changes mostly for indexing consistency.
Authored by: tswift 2016-02-15
Parent: [r8642]
Child: [r8644]