Actually intelligently fix the last commit