WLS: more tweaks to overall structure.