Added AnamorphBuilder; cleanup of some cruft