Addressed all comments. I even gave up on the lastLastSample in favor of "previous", which only causes me minor disgust.