Finished refactoring marker segment parsing, #94.