Notes API consistency fixes

This fixes #2623.

I put the note after the repo as it's like the "object" we're dealing with, which seems to make more sense than changing `_remove` since this makes it go in order of specificity.