Some of these look a bit suspicious, so need to double check them before merging.
ArgumentNode
ExprReturnNode