#461: More code review comments