Previous commit (ac2eb3) was incomplete. This commit fixes it. The commit also includes an general uniformity fix.