minor cleanup on basic operations parsing