Initial 1D support and cleanup.