haddocks: post-"Internalization" clean-up, round 1
haddocks: post-"Internalization" clean-up, round 2