Cmp offsets

A few more clean-ups now that this isn't just toy code anymore.