Updated to better handle enqueued convenience script tags.