Improve `return` matching for inlined filter functions

Also resave file as UTF-8

The improve return portion of this is equivalent to merge of pull
request #587 on July 11, 2013 on mleibman branch