harmonize with upstream

This is so later merges to upstream get easier. I removed some discrepancies that where
not all that useful.