Allow for smarter injections in and around lists

See: https://github.com/GigaOM/gigaom/issues/5789 (also the final fix in https://github.com/GigaOM/gigaom/issues/5760 - the overlapping images issue was already resolved).