Hi,
CONFIGs look alright to me.

As for the context save stub I don't think you need to remove or do anything. The IF(CODE_SIZE<=2k) tells the assembler to automatically insert that piece code when and only when you HAVE a chip with 2k or less, if the chip has more than 2k the statement evalutates false and the code won't get it inserted. Automagically....

Obviously you CAN remove it when using the F88 but there's really no need to as I see it.

/Henrik.

EDIT: OK that made my post pretty redundant, went for a cup of coffee and Darrel beat me to it.