Some schemagraph cleanups