A few minor improvements

This contains some performance improvements to ```recursive_star``` and some general cleanup (I've removed some unneeded includes, etc. so the build times are slightly better).