Made a couple more enums into abstracts.