#26 bit of cleanup and things don't crash now so that's good.