Aliasing fixes, optimizations, etc.