misc cleanup

Per https://groups.google.com/forum/#!topic/tarantool/oLp8lsrSZ2c