Clean up i/o properties are categorized

No functional changes here - this is just making the code a little more
readable (to me).