Aliasing fixes: part 2.