Improve parser entity handling, clean up logging categories.