we will always want to do this anyway, and less code duplication means less places to forget to do it.