Fixed code to work with all non-alignment-checking benchmarks.