No need for dummy variables. Fix up some function prototypes.