Fix the type table so that it uses more idiomatic markup
A bit of fiddling in section 2