More garden refactoring.