Finish up enum + enum variant handling