Improve source map option handling.
Clean up comments.