The attached patch merges the best bits of my version of the 0x123.456 deprecation into James Mastros's version that went into blead some time ago. -zefram