We don't need these any more.  I'll remove them in master if this is the only outstanding comment.