This commit should also get rid of pointless option warnings.

Also removed an extra ) that was causing a bad cpu value.

Signed-off-by: Rosen Penev <rosenp@gmail.com>