Cleanup "x"-to-'x'

Edited from GitHub because VS is screwy