Better support WMC configuration (#3).