Small optimizations to SDTWWarp