Handle maps more cleanly.