Clean + support states in plotoptions with weird inheritance