Move over to a new way of parsing that includes less magic numbers