Improve compatibility with the new Twenty Fifteen default theme

Resolves issues brought up by @neillmcshea in ticket #30429 on central.

See the original ticket on Central here → https://central.tri.be/issues/30429

See a detailed overview of these changes I made here → https://gist.github.com/momnt/e049d7a8649b9b3e19a2/