Working with bamtypes to bring things up to date and make things coherent.