> 2) Of the "functional" changes, almost all of them conflict heavily (and will 
> almost certainly be replaced by) changes I'm working on to eliminate the 
> "APTD" table completely, which will help both platforms.

there's no way to know about your "local" changes.
how are you going to eliminate APTD, and how does it conflict,
and how will it replace the change?

> 3) If you're going to make changes on behalf of PAE,

no.  PAE is not important, at least for me.

YAMAMOTO Takashi