Revert "Use pl here"

This reverts commit 29e5d83d2a2c9db13d4022bbc7122f777dde87ce.
Revert "A bit of general maintenance, mainly related to issue #69"

This reverts commit 3c4cca741342d77e28d8f48aa0e6243791b47bd4.