Improve statement wrapping across new lines

Fixes #289
Semicolon-less declaration verification

Closes #323