Fix complaints about inlines and returns.