Cleanups from review with Loek.