Clean up keywords a bit.