Remove superflous test and make others more rigid
Remove superflous test and make others more rigid

beni55/elevatorsaga,maxsites/elevator,koalazak/elevatorsaga,tcort/elevatorsaga,tksugimoto/elevatorsaga,tcort/elevatorsaga,tksugimoto/elevatorsaga,beni55/elevatorsaga,maxsites/elevator,koalazak/elevatorsaga,tksugimoto/elevatorsaga,magwo/elevatorsaga,Endika/elevatorsaga,Endika/elevatorsaga,maxsites/elevator,magwo/elevatorsaga,Endika/elevatorsaga,kawasima/elevatorsaga,tcort/elevatorsaga,kawasima/elevatorsaga,kawasima/elevatorsaga,beni55/elevatorsaga,magwo/elevatorsaga,koalazak/elevatorsaga