Make a slight change to how gmap element processing works. This should reduce warnings. Add some tests.