DRY fields to protect finder; remove unused variables.