Made trap-doors strict.