More work on parsing values