After F2F discussion with @aledsage realised that this change is the result of a merge error - casting to `EntityInternal` will work. However the equivalent change on the 0.6.x branch *is* faulty, and needs changing to look like this master branch code.