Fixed some artifacts from my rebase-fixing-operation.