Always indicate that faction was chosen when placing player.

This fixes bug #21977.
Minor style improvements.