Merge "x.ref/lib/modules: comment and API improvements."