Aliasing fixes: part 1.