Minor refactoring cleanups
Push image length handling down into ImageSegment
Use new skip routine