Apply `defcustom` fixes

The first form was already a `defcustom` form, but didn't have type and
group specified.  The second form was turned into a `defcustom` form
additionally to these changes.