I think these are currently your only two options.   Sounds like a useful—and relatively simple—feature. You should submit a feature request.