Now that you mention it, I don't know what the right thing to do is. I know we don't use some of these, but perhaps others have grown to expect them. I'm still leaning towards smallest possible footprint for initial implementation and if someone needs these in the future, PRs are welcomed?