Forward-port the handling of addition and subtraction

See http://svn.zope.org/zc.buildout/trunk/?rev=127336&view=rev.

This bug fix should be part of Buildout 2 too.