Clean up 2025 hacks

[strugee]

I put in a number of... kinda ugly patches this year, in the interest of time. We should clean these up:

• 1a64858#diff-b9f12213bb098c6c7e70d5e035af466e0d5b7fefe25a8ccfc889c284a5c0dcc8R55
• edc7400
• 1f5ea4f