Some more minor conditionality and removed whitespace effort

Let's discuss this on the api mailing list, it is not related to this issue.