Fixed forever

Got some things out of sync, which made this confusing, but I think I
fixed it.