Possible fix for #833: Partially preprocessing files not working

Additionally made some minor adjustements to the handling of the
definitions.