ES5 filter and map wrt #2

 - also, I may have gone overboard on the whitespace stuff :)