SRL structures/reader refactoring again.