Track column count explicitly 

Fixes #63