Renamed proc.fun to proc.block.
Using is_nil in more places.