Fix parser wrt to defcustom syntax related changes