Great job factoring these out! I wonder if we could further merge them into a unified method, since they are so similar. Maybe add a TODO for future? Anyway, never mind.