Samplify build.xml, too.
Fixup environment junk.