Small refactor that we want to make sure doesn't break! Please report bugs if you find them.