Making SIROC more elegant in documentation and in code.