* fixes for the merged Poem extension, per comments by Tim Starling on CodeReview...