added workaround to avoid CodeNarc exceptions when using the spread operator with maps, cleanup

http://sourceforge.net/p/codenarc/bugs/155/