Looks like you're not using these just yet.  If you could remove them from the pull request, I'll merge this in.