WYC: some very minor tweaks.