[BISERVER-10656] Further Subfloor-JS optimizations