Refactor const to highlight their coupling #4278