Some refactoring of code.

Tree sampling and scoring of marginal likelihoods for inputted trees now
enabled.