Marked more methods as internal.