Syntax cleanup, version increment.