continuing af471d33 by making some unimportant things consistent