Tweak handling of step option values to be more precise