#155, 'draw' options logic refactorings...