Wax quick fixes

This does two things: first, gets rid of the bouncy behavior in Wax, and second, makes figures + captions more comprehensible. See #688 (closed) and #686 (closed) for the problems this is meant to address.

Note that the debouncing fix is specifically for old Wax – in the new Wax in the Jats branch, this behavior shouldn't be happening at all because Wax itself changes. Visible figures should go forward though.