Replace gui-method macros with cl-generic with &context