Minor dictionary improvements.