Better type safety in the HPT analysis code.