Fix some warnings from Clang trunk in an overly aggressive manner

Please change this to not take a dummy parameter and just return `nullptr` instead.