Fixed ol ul... nesting issues. Replaces pulls #862 and #870.

@cfarquharson FYI.