Method scoping and map insert fixes.