I see that a lot of this work has been done below. Leaving that issue open so it can be used for standardizing this further across the codebase.