Some fine tuning after the recent general modularization.