Avoid unnecessary map lookups