Looks good to blobfish.  Was just going to check and see if this var (isLoadingOnDemand) used anywhere else in the template we could remove it, but it looks like it is still used.