Some more obvious optimizations