Re-apply "Better clamp and wrap variable names."

DAMMIT @zeth