Depending on my fixed circular-buffer.  Cleaned up some code.