Fix a few code style remarks.
Removes some casting of size_t to int.