Remove 'register' keywords.
Change method sigs to a more current form.
convert s_return from macro to function.