Further improvements for https://issues.apache.org/jira/browse/PROTON-474