Improve compatibility with OS X

@D-Alex: These should already be included in the foreach() just below.