Switch from tap to tape for testing
Switch to using my continuables implementation
Stop storing things in properities that don't call for it