Better aliasing
Prep for 0.4.2