Conform to suggestions by CHH at
https://www.escidoc.org/crucible/cru/DDBNEXT-123#CFR-9186