Improve flexibility of which code types are used in claims and other misc.