Simplified map and overlay handling a little.