Tiny simplifications