Minor improvements after Arjens comments on previous commit.