Update PPA to use new extension code. Cleans things up quite a bit. See #143