Put parsing in the right direction again.