Fix more overflows (CID 75145,75137,75104,75094)

#314 without the unnecessary whitespace change.