Split function declarations into two lines
Cleanup compiler casting warnings