Slightly change parts of the previous commit to reuse existing code, and enforce...