I think #522 is probably a better fix than continuing to add view types explicitly.