More thorough Sr expansion. See #24.