No fixes, but some minor improvements/tweaks made as I read through
the code closely.