astyled code (not sure about spacing in brackets though). added explicit fixes for #7117