I guess it would be good to create tests for that, even if they fail with this patch. The testing of this patch is quite basic... you should verify types, etc.