Some further ExthHeader refactoring
Subproject update