More work on options and default parameters.