Fix a couple of valgrind-spotted out-of-bounds accesses that may have been causing...