Add order arguments to two functions.

[MHenderson]

Instead of inferring the order of a Room square, require that it's provided as well.