I think your interpretation is perfectly valid! Also the first thing I thought of, and the joke works just as well either way.