haddocks: post-"Internalization" clean-up, round 4