Separate policies choices and discoveries. Resolves #15