Follow-up to 56ac0ee. Corrected compile errors.