Switch this to `if result is not NotImplemented` and squash all the commits and I reckon we'll be good to merge.