Extract constant not working around binary expressions

Fix for GRECLIPSE-1600