Cleanup the whole darn __clean_tmp() function

Fix still-b0rked comprehension. (Assuming Travis ends up agreeing with me.)