Cleaned up more coordinate stuff.