Better undefined handling and matches the upstream dev version with our pull requests