cosmetics: Drop leading underscore from extra_ variables.