Updated to work with recent changes to Nak.