Fix #500 (and cleanup sleeping bag code)