Remove possibility of custom vars

Retained temporary backward-compatibility vars until 1.0
Ditch the special treatment of None