Make things a bit more friendly and pluggable.