Cleaned up `defcustom' forms (among other things...)