(Despite an explicit cvs diff of packages to review, ENOTENOUGHCOFFEE lead to not carrying thatt to the commit. Sorry for the noise.)