Done; I also discussed the annotation further with Artem, and will move it - just for consistency with XML modules.