Fixed ID keyword expansion.