Only auto-merge fields that aren't merged explicitly.

This solves the problem of @method getting an auto-detected :default
field which doesn't make sense for methods.