Refactor guide support.