Fix trailing comma issue in array definition where it choked on closures and multiline functions

Closes #5 #16 #9