Small refactorings for --use.implicit.defaults & --use.explicit.defaults options