SW-112. Addressing suggestions from https://openwsn.atlassian.net/browse/SW-112?focusedCommentId=14501&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-14501.