Ah. My fault then. Sorry, Bodrin.
I'll take a run at this tomorrow, and hopefully have a fix by the end of the day based on your suggestions, Aaron.
As an aside, should all the types and subtypes from that file be sourced to the Monster Manual? Or should they not be sourced at all? It currently appears to be inconsistent as some of the types (5 or 6 off the top of my head) are sourced, but none of the others.
Any idea when these fixes will be publicly available? (This is for the bug that adds +2 to Reflex saving throws.)