A few things had not been updated to module reorganisation

(0) -30 -10 -1 +1 +10 +30 tip

mercurial