simplify optional-data handling in the default case