Fix void arithmetic, non-void returns and redundant semicolons