Fix some scaffolding multiple definition problems.