Fix up keyword handling