This looks okay to me, but can't test against 1.3.6SVN since apparently that still crashes with curves and my 1.3.6 is very unhappy after the crash.