Increase default number of samples for INFER from 1 to 50, plus some cleanup.