- #45: Improved schema declarations, processing, and comments.