Ahaggar: regroup more *_TYEP nodes

Signed-off-by: Djalal Harouni <tixxdz@opendz.org>