Continued to improve room layout parsing.