Support dynamics, and incorporate code review comments.