Removes all the unecessary casting to ICanBeDirty - not sure why we've had it like this for so long.