Added a forwarding dictionary and cleaned up some cruft.