Forall intents - the initial implementation.

So, do you intend to perform this cleanup prior to merging the PR?