Follow-up review comments from 3066

@lavalamp - these are the changes based on #3066 review comments.