Partially rework previous commits.