Stylistic changes (with Veged). Tests pass, but stuff may be broken.