Removed typed addresses -- too hard to use in that implementation.