refactoring of default value handling in parsing

see issue #47