Minor changes to remove implicit any types.