Checkpoint before refactoring ... again.