Code movement from review comments.