Minor update to change some runtime conditions to compile-time conditions.
Minor update to change some runtime conditions to compile-time conditions.

Granary/granary,Granary/granary,Granary/granary,Granary/granary