kalua: minor cleanups