A few unused variables have been cleaned up in the sources.