Stop using one line statements.

Also remove unneeded parentheses.