I don't think you get any simpler than the @unit options. With Classic removing target specific elements what you are already doing is the next simplest thing unfortunately. Unless of course there is something out there that hasn't been documented yet.
|