Refactor investment and appraisal code

[alexdewar]

I didn't finish the job of refactoring the appraisal code with #1199 as I wanted to avoid merge conflicts with other work in flight.

Once that work is finished we should have another pass at this code to tidy it up.

[tsmbland]

Possibly addressed by #1391, although maybe you had other things in mind