Clean up aliases a bit more