Slight improvement to waiton expansion that supports [system ...] and the like