Commit 7944b790 move more types to the types namespace Slightly bigger than the last one, but no functional changes.