Make rendering faster by avoiding apply in more places