Added layering to fhspeak and QBF.