Solve last remaining conflict of whitespace. Good grief.