Responded to Ram's comments on
commit 29111c8a59a004482c9304a
These are all pretty safe/small changes.