Additional changes to improve fix #9 for warnings I didn't catch
when compiling with gcc.