Correct logic error in treatment of special green rule 17 and 22

As written the condition read

	(TAG(theElement) == PYRAMID && NSONS(theFather)==9) || other_condition

that is ECLASS(theElement) == GREEN_CLASS was not always checked. We assume this was not intentional.