PP-6 + PP-7 + PP-31: some refacoring cleanup, plus be able to call score from either endpoint.