Tidy up some code in st_stuff.c