Conform to rangy's latest required style