Some more waterfall-related plumbing and groundwork.