Revert "New convenience constructors and other minor changes"

This reverts commit 3c4944b2432fb5cf401a1cd23b9e1bb4793de3d1.