Integrated feedback from PR code review.

Still to do: cache compilation units, less strict dependency versions, document all used wst internal classes, possible @ident. fix