Updates suggested by @pekrau and @remiolsen..