Merge smaller differences from latex2e_adaptive_preamble.