tiny tweaks suggested by analyzer
v0.21.0