Resolve "Intend: Make spouses intend get spouse instead of number of spouses"

Closes #51

See merge request !56