Agree with @jeremy here - this is a subjective change and I don't think it's worth polluting the git history for it. The simplification of `get_primary_key` is is marginally worthwhile so if you update the PR as I suggested below and remove this change I think we can merge it.