Core: Small refactor to replace a conditional with a default value