Update example to remove the need for the == macro.
Initial pass to support arbitrary maps for #6