Some alias cleanup.