Decided to leave this in for now. It's a sane thing to do for an initial cut of this. If someone finds it to be limiting we can address it.