improve regexps for array, slice and map types

Closes gh-28