FACES-1925 a few more changes ...

needed after rebasing Kyle's changes to the generator.