cleanup imports in a bunch of little places.
first little bit of testing r_expr (found a bug!)