Another round of stone refactoring