Introduce an optional divisor argument and clean up the ad-hoc argument
parsing.