Cleaned and clarified deferred embeddings code

Cleaned and clarified deferred embeddings code #1197