r-generic-builder: clean up the expression