Improved helper method, marginally.