See commits. Nothing groundbreaking for now, but should behave slightly better. Bigger changes may come soon, but they're %GNOME 45 material, so I'm limiting this MR to %GNOME 44-friendly commits.