ValueParser fixes and unit tests.