resourceloader: Optimise and simplify state propagation logic