Fixed Bug 7960

http://hercules.ws/board/tracker/issue-7960-scriptc-warnings/
Also applied a temporary adjustment due to ERS_OPT_CLEAN not being consistent (decent fix will follow up, haru and i are working on it) -- thanks to kyeme for pointing it out!

Signed-off-by: shennetsind <ind@henn.et>