revised to constants-only, structure enumeration