[BUGFIX release] Reduce even more meta calls by passing it along in other places