Refactor|Client|Shadow Bias|BiasTracker: Minor cleanup refactorings