[cjonas]

Would have been more realistic if the code went full FP before being refactored back.

But ya, none of those solutions seem great