Some trivial improvements.