Refactor s:bold_* stuff