Metadata API notes & comment clean-up