Minor refactoring (inline with DSXS)