some more weak "optimizations"