Small cleanup to general.cpp