Just what I spotted at the first glance. There's more general cleanup to be done, e.g. regarding the public API.