Fix issues that cause `nil` to loose arguments.
Version 0.0.2