Restructure environment/aliases to reduce conditionals.