Grape-related constants extraction fixes