ZenCoding: Updated with fixes for #568.