Reduce the hacky-ness of prior commit.