Clean up NOCOMPAT comments

Comments with NOCOMPAT have been added to questionable code that needs reviewing and more thorough testing. Check these towards the end of developing the nocompat branch.