Fixes addressing @parkr's wonderful comments.