Add modules filter trimming.
baseset.h lines regroup