More notation cleanup