Cleaning up, per yoni's comments

I don't think anything is controversial here, but getting into the habit of submitting pull requests with small commits. If no one says anything by tomorrow am, will merge into master.