Broke out hydrography layer for easier testing. Minor cleanups.