good idea; this bit is performance critical.  doing in fix-up patch.