Update and simplify keywords a bit.