Neither change is particularly risky/complex.  What I did is less code and results in less stuff happening during execution (the selector is skipped completely by jquery if it's not a room if you go this path; the other way we'd write logic that skips it ourselves).