Update license year; move a comment to above the correct methods.