Issue #2142257: Cleanup from coder module suggestions