Fix return value of define/defun, reverting the last patch