Follow up to r111309; fix if condition and style fix