Concrete header classes replaced by kinds

AS a consequence, instanceof checks removed, code simplified
TODO added
++