A bit of R# cleanup