Clean up some of the STree macros in shell.h