Fix some improperly merged code.