Add more clean up and diff with current DrangonFlyBSD code.