better savepoint locations

Fixes #1137