Complete simple for-traverses (requiring use of only `map`)

Fixed a problem caused by failure to recognize where `map` usages
were occurring due to the variety of ways that the AST can be
changed by implicit conversions / arguments. Now simple for-
traverses should be working, but more complex traverses requiring
`flatMap` do not.