Add support for non-lazyloaded figures.