These helper functions should be removed as well. It should always use the player holder. But let's do that as step 2 since that will blow up the diff to all other files too.