Converted back to goto-jumps as suggested in #592
Renamed `rm_buffer_from_list` to `wipe_or_delete_buffer` as suggested in #592
Moved comment to function as suggested in #592
Revert "shortened return cases"

This reverts commit cf1f6e740503c728dbe74fab8452f40c4ee549af.