for own-built unary, cleaner vars
Merge branch 'evaluate-ownbuilt-unary-voc2010-2'