Follow-up from #8.