Enable previous if0'd code during strict testing; Fix build