Clean-ups, make life easier for module authors