[slime-devel] Refactoring, take two