I went ahead and did this at define-time, rather than at use, so it's harder to miss if a new use turns up.