12th Mar: Page-bottom layout change on the way. Details here. Causes no change to editing/formatting of articles. This is just FYI.
Energy Weapons has enough examples that laser guns and melee energy weapons can each have their own article. We just need titles for the new articles. All I can think of is Frickin' Laser Beams for laser guns. We can keep Energy Weapons as the supertrope page, and I guess Wave Motion Gun could be added as a subtrope, alongside energy handguns and energy melee weapons.