Added by-name interface handling too.