GUAC-825: Add proper comments where previously missing.