End alignment

An alternative solution for the end alignment problems #346 and #350, including a split into two cops.

Based on comments I've made in PR #358.