Separated out callback handling of options.
Added --number/--no-number options.