Identifier extraction DRY fix.