Options for entities.

More robust handling of comments.