Clean up configuration parser, fix edge case.
Remove "option" keyword -- options need no introduction.