See my earlier comment about making these optional.