Tile promotions (especially involving fire) can create infinite loops

[tmewett]

See #341, #224. Known issues were fixed by #224 and #344 but the call order is still difficult to understand - so this ticket tracks any larger-scale refactoring to make the logic more predictable.