Per @scottheckel's suggestions.

Thanks, @scottheckel!