Logic fix -- was trying to be clever, but burned by precedence rules.