grim/guifications2

0f68a71a854a
Stealing this from grim's recent gf3 commit so distcheck will pass if we
quit munging prefixes.
For all news and changes please see the ChangeLog