Fix syntax errors/vars in previous commits.