Fixed errors in goal refactorings related to expansions