Removing deprecated bits
Assertions to catch bad notePendingX