Much appreciated, as it is a full answer to the question.

To reiterate though for my benefit, and maybe others at my low level of understanding.

If I use assembly style configs, either in my code or the PBP PIC.inc defaults, if I need to use a non PIC default config setting I should also add all other config values associated with that particular register, to make sure they don't get changed from what I expect ?