Stop evaluation of excess term if excess term is not being used
Authored by: Ian Bell 2015-11-10
Parent: [a4ab6d]
Child: [bbd9cd]