Fix several bugs in keywords program.