Globally fix return parameter handling to not use brackets