Added line number to statement writer.
Fixed bug with default case in applyOrElse in partial fs