Some minor cleaning up (#257).