Avoid lots of cases in core