Maybe add a define that enables lines like 1157 instead of commenting them out?  Applies to lines 1244, 1308, 1341, too.