Closes the rest of #1601