A few more cleanups in src and Jags dirs