Minor changes to get negation working again.