Actually fix the incorrect unit disposition bug.
Remove debug output for release.