Good call - I more or less was copying from what already existed here, but that is definitely better.