Clean up offset handling.