static vs. self fixes.