Clean up NoneType @returns handling