Commit before attempting to fix binaryexpression handling.