diff --git a/Storage/Disk/Track/PCMSegment.cpp b/Storage/Disk/Track/PCMSegment.cpp
index 3af3d966d..12e96fe77 100644
--- a/Storage/Disk/Track/PCMSegment.cpp
+++ b/Storage/Disk/Track/PCMSegment.cpp
@@ -53,7 +53,7 @@ PCMSegment &PCMSegment::operator +=(const PCMSegment &rhs) {
 Storage::Disk::Track::Event PCMSegmentEventSource::get_next_event() {
 	// track the initial bit pointer for potentially considering whether this was an
 	// initial index hole or a subsequent one later on
-	std::size_t initial_bit_pointer = bit_pointer_;
+	const std::size_t initial_bit_pointer = bit_pointer_;
 
 	// if starting from the beginning, pull half a bit backward, as if the initial bit
 	// is set, it should be in the centre of its window
@@ -89,7 +89,7 @@ Storage::Time PCMSegmentEventSource::get_length() {
 
 Storage::Time PCMSegmentEventSource::seek_to(const Time &time_from_start) {
 	// test for requested time being beyond the end
-	Time length = get_length();
+	const Time length = get_length();
 	if(time_from_start >= length) {
 		next_event_.type = Track::Event::IndexHole;
 		bit_pointer_ = segment_->data.size()+1;
@@ -104,14 +104,13 @@ Storage::Time PCMSegmentEventSource::seek_to(const Time &time_from_start) {
 	half_bit_length.length >>= 1;
 	if(time_from_start < half_bit_length) {
 		bit_pointer_ = 0;
-		Storage::Time zero;
-		return zero;
+		return Storage::Time(0);
 	}
 
 	// adjust for time to get to bit zero and determine number of bits in;
 	// bit_pointer_ always records _the next bit_ that might trigger an event,
 	// so should be one beyond the one reached by a seek.
-	Time relative_time = time_from_start - half_bit_length;
+	const Time relative_time = time_from_start - half_bit_length;
 	bit_pointer_ = 1 + (relative_time / segment_->length_of_a_bit).get<unsigned int>();
 
 	// map up to the correct amount of time