Quantize fixes and cleanup, part 1...