Further delinting, refs item:557