Sprinkle a bit of strickness to get rid of memory leaks (now uses constant memory)