Replace single if lines with brackets in astyle

This prevents us running into single if line errors. In particular with various contributors this is relevant.