Per @detro's suggestions

Thanks, @detro!