Use custom-set-variables
Remove needless binding
Improve wrap/unwrap utilities