This might be nice for 1.5 if there ends up being a bunch of other PG-related stuff going on this release.