HP: Industries complete

Also cleaned up cruft code that was building up to make the code leaner
and less exception-prone.