Finished the #defines in OI.CPP.