Remove a parameter that was always called with the same value in
compToCWithInfos.
Remove an unused parameter.
Remove a parameter that was always the same value.
Remove a parameter that was always the same value.
Remove a parameter that was always the same value.
Merge pull request #42 from pjonsson/misc-stuff

Minor cleanups