Replacing batteries in NiteRider Solas 2 Watt USB Tail Light or Serfas Thunderbolt?

Has anyone here taken either of these lights apart to replace batteries? Turns out these are great lights, but I hesitate purchasing without being able to replace end-of-life batteries.

NiteRider Solas 2 Watt USB Tail Light

Serfas Thunderbolt

Any feedback on how well the batteries hold up over time and what the actual run-times are?

BUMP