Fixed up more of the keyword parsing implementation