Moved a couple stray bits inside motion sensor guard.