Sorry, I missed the "export=true" in the module.xml definition (not sure how). 

This looks fine then. Will pick up in next round of merging.