After adding unit-tests (following in another patchset) I found a bug in my last patch.