That looks pretty reasonable to me, and, more importantly, would increase consistency as you point out :)

(I have had a similar issue in the past, where I expected this to work but it didn't -- so I replaced NoneType with lambda: None.)

cheers
lvh