Refactoring WellKnownBehavior to be be typed

As per discussion with John after Pipeline presentation.