use shorter OR syntax for defining consts, clean up dkowpmigration