more refactoring for updates on ISIS-463 (now complete, we hope)