Removed global state, some From-To improvements.