A better way to handle the '---' marker (Dogh!)