Changed to aliases that check for nils.