Avoid some function casts

This revealed some places where we didn't properly return a value but used void instead.

/cc @arun-mani-j

Merge request reports

Loading