Minor rewrite

Check previous commits for additions and deletions.

Build passes on `>=5.3`.