more flexible in position detection (this isn't used yet anyway)
yeah, stop collecting that if it's reliably in the comments
don't bother with state_name either, better to transform state code from a dictionary - and state is parsed out of the comments too