Incorporate @jsalvatiers suggestions.