LPS-45271 Refactor handling of default values