Cleaned up aliasing, getting rid of keys and forEach along the way.