Add Australian EIT fixups.

This is a good first pass, any further improvements welcomed.

Fixes #10098