static -> const where appropriate