Remove address ranges
Add expansion of Ft -> Fort, ref #52