Code review for tmp_spaces_1_6, fixes gh-34.