CHG: Make wunit a boolean value