Various Redex tweaks and cleanups