Some cleaning up (#142).