Fixed up dagger routines. Make yes no look the same everywhere.