Fixes some style mismatches of the recently merged PR.