Documentation and conformance tweaks.