Yeah, exactly.  That's on my TODO list for this PR but I wanted to get this much out for review first.  I'll do that before this merges.